Merge "Use HTTPS instead of HTTP for Amazon"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 19 Jan 2017 18:46:46 +0000 (18:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 19 Jan 2017 18:46:46 +0000 (18:46 +0000)

Trivial merge